Merge branch 'master' of git://git.denx.de/u-boot-mmc
authorWolfgang Denk <[email protected]>
Wed, 20 Apr 2011 20:18:13 +0000 (22:18 +0200)
committerWolfgang Denk <[email protected]>
Wed, 20 Apr 2011 20:18:13 +0000 (22:18 +0200)

Trivial merge